Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev