Merge "msm: camera: Fix camera switch issue" into msm-3.0