Merge "mdss: Correct the solid fill color swap for mdp3"