Merge "Fix uninstallation tracking in the Backup Manager"