am b204d4f1: Merge change 2136 into donut

Merge commit 'b204d4f12773ec67c7f0ded41cb111018f154476'

* commit 'b204d4f12773ec67c7f0ded41cb111018f154476':
  First pass at cleaning up the gestures code.