Merge "ShortcutManager: proper work profile support" into nyc-dev
am: d5b745a

* commit 'd5b745a9e64734483bc43c781ad809b2a75bd1ba':
  ShortcutManager: proper work profile support

Change-Id: Ic31214205a5a93e37e5585829ae522bf4890b519