Merge "msm: camera2: Fix to flush the queue in cpp driver"