Merge "ShortcutManager: Fix work profile" into nyc-dev