Merge "Refactor ModifierShortcutManager." into main