Merge "Make overrideHdrTypes per display"