Merge change 22045 into eclair

* changes:
  Fix bug 2045914: When pressing 2 keys, sometimes the second key gets stuck.