Merge "Use ColorDisplayManager for night display"