Merge "[SettingsProvider] fix the removing of old keys"