Merge "drm/msm/sde: increase hw reset wait to 2ms"