Merge "Add HDR-related revisions to graphics types"