Merge "Test for ShortcutManager.updateShortcuts(), also" into nyc-dev