Merge "SnapdragonCamera:Avoid black preview"