Merge "Remove ColorDisplayController"