Hotkeys GUI: Fix Normal Hotkeys Randomly being assigned to VR Hotkeys.
Merge branch 'VR-Hydra' of https://github.com/cegli/dolphin into VR-Hydra
Grabbing Cegli's latest commit to fix a bug in the KBM/XInput code!

Conflicts:
	Source/Core/Core/ConfigManager.cpp