Merge "msm: mdss: ensure rotator work is done before reconfiguring session"