Merge "Add ColorDisplayManager"