Merge "Actually use the hdr mapper for AV1 in GetHdrProfileLevelMapper"