Merge "msm:mdss: Fix the issue with AD resume"