Merge "[SettingsProvider] fix memory usage counting when owning packages change" into main