Merge "drm/msm/sde: fix race condition between enable/disable events"