Merge "drm/msm/dsi-staging: avoid DMS on CRTC active change"