Merge "msm: mdss: update for error logging"