Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev