Merge "Allow for uninstalled apps in ShortcutManager" into nyc-dev