Merge "msm: mdss: Fix potential race condition in assertive display"