Merge "drm/msm/dsi-staging: remove display from active list"