Merge "msm: camera: crm: Add mutex lock to avoid race condition" into dev/msm-4.9-camx