Merge "msm: mdss: Prevent non-zero backlight following display blank"