Merge "msm: Camera: clear control queue" into msm-3.0