Merge "bugfix 5370554 camcorder preview background is inconsistent"