Merge "[SettingsProvider] clean up if a setting failed to be serialized" into main