Merge "Store the HDR Conversion mode setting to Global settings"