Merge "msm: camera: sensor: Avoid race condition for register settings" into dev/msm-4.9-camx