Merge "msm: camera: sync: resolve race condition between merge and signal" into dev/msm-4.9-camx