Merge "msm: camera: Change S5K3L1YX register settings" into msm-3.0