Merge change 2136 into donut

* changes:
  First pass at cleaning up the gestures code.