Merge "ShortcutManager: Optimize package scanning" into nyc-mr1-dev