Merge "Fix keymap build dependencies and variable name collisions" into klp-dev