Merge "Refactor ShortcutManager to ModifierShortcutManager" into sc-dev