Merge "Revert "Ensure packageRemoved is called when UID is removed"" into main