Merge "camera: Fix for recording." into msm-3.0