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

* commit '5fe29adc81d2c43c816d8dbeb5d6bba215aadf6e':
  ShortcutManager refactor: per-user information class