Merge "[SettingsProvider] do not write under mLock" into main