Merge "drm/msm/sde: update scalar configuration for color fill plane"