Merge "msm: mdss: fix display time out when taking ESD test"