Merge "Add plumbing for HDR metadata"