Merge "Move a11y color transforms to ColorDisplayService"