Merge "msm: camera: context: Fix race conditions" into dev/msm-4.9-camx