Merge "docs: Updated ShortcutManager and ShortcutInfo class references." into nyc-mr1-dev