Merge "ColorDisplayService should always be started"