Merge "Fixup ModifierShortcutManager#getApplicatioNShortcuts on HSUM" into main