Merge "msm: mdss: Fix watermark level calculations for pipe updates"