Merge "SettingsProvider perf test"