Merge \"ShortcutManager: Optimize package scanning\" into nyc-mr1-dev
am: 3e27d1254b

Change-Id: Ib12942df9e948be7f7b3af704c7aef82d1b9f77f