Merge "Add enum type for supported HDR metadata"