Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev