Merge "Replace ColorDisplayController references"