Merge "ShortcutManager: Clean up for uninstalled packages." into nyc-dev