Merge "drm/msm/dsi-staging: fix ESD check scheduling sequence"