Merge change 20331

* changes:
  KeyInputQueue: get the name of the virtual-keys file from the input-device name