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