Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-dev