Merge change I0743a389 into eclair-mr2

* changes:
  Close popup when Keyboard gets a CANCEL motion event.