Merge "[SettingsProvider] move handler to background thread" into main