Merge "ShortcutManager: Cleanup package info handling" into nyc-dev