Merge "ShortcutManager refactor: per-user information class" into nyc-dev