am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)" into ics-mr1

* commit '5d58eb06bcc8671bae72fb2389a9929e106131cc':
  Fix a few memory leaks in the input dispatcher.  (DO NOT MERGE)