Merge "msm_serial_hs: wait for clock-off to complete before shutdown"