am 5ebc2f8a: am 1c820c41: Merge "Don\'t cancel gesture trail update drawing" into jb-mr1-dev

* commit '5ebc2f8ad492c0c8cd35b31a4d96aaf6a0959d0f':
  Don't cancel gesture trail update drawing