Merge "msm: mdss: cleanup clock control logic"