Merge "[SettingsProvider] fix SettingsProvider on work profile restart" into main