am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1

* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
  Shortcut keys should be handled on down, not up.