Move SettingsProvider overlay to common