Merge "msm: camera2: Enhance flush queue interface in cpp driver"