Merge "SnapdragonCamera: Fix video fps is 60, preview fps is 30." into camera-SnapdragonCamera.lnx.2.0