Merge "Move color modes to ColorDisplayService"