Merge "Refactoring ShortcutManager + bug fixes." into nyc-mr1-dev