keyboard stuff

CLI: Improve keymap folder resolution (#20981) master


+32 -13
5 changed files