Merge "msm: camera: use correct instance of local queue pointer." into msm-3.0