Merge "Move Night Display methods to ColorDisplayManager"