Merge "ShortcutManager refactor: per-user information class" into nyc-dev am: 5fe29adc81
am: 339f8ed340

* commit '339f8ed340a95c6a31a14c0d686e2311787d14e0':
  ShortcutManager refactor: per-user information class