Merge "ShortcutManager: Handle package broadcasts." into nyc-dev