Merge "[SettingsProvider] always destroy old tracker before inserting a new one" into main