Merge "msm: camera: Fix some ref count issues and race conditions" into dev/msm-4.9-camx