Merge "Add owner for ColorDisplayService"