Merge "Fixed mixup with keycode / modifier mapping." into main