Merge "msm: camera: fix bug in camera msm_vb2 implementation"