Merge "Add HDR metadata types to graphics/common"