am cb04b4a0: am 82c4163e: am fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev

* commit 'cb04b4a0e6cdb05a3c900312cb3a7b2dd855e11e':
  Cancel touches as well as pointer gestures.