Merge pull request #7746 from Techjar/fix-hotkey-conflicts [RFC] Core/HotkeyManager: Fix default hotkey conflicts
