Merge "Refactor ShortcutService" into nyc-dev