Merge "msm: dcvs: use wait_q"