Merge "Add flag for ModifierShortcutManager refactor." into main