Merge "msm: camera: Fix couple of potential race conditions." into msm-3.4