Merge "ACodec: Handle HDR10+ metadata at OutputPortSettingsChangedState"