Merge "Fixing ProxyPrefs not removing values correctly" into main