Merge "Fix stretch between preview and video recording" into camera-SnapdragonCamera.lnx.2.0