Merge "drm/msm/sde: ignore scaler v2 data if not enabled"