Merge "Move ColorDisplayService to color subdirectory"