Merge "msm: mdss: reset intf number from control path"