Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev