Merge "Move color management check to ColorDisplayManager"