Merge "msm: mdss: fix the display reset error"