Merge "Make SettingsProvider reset no-op for now."