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

* commit '1c820c414606e10b5f4874548bb543b0ce78ecb5':
  Don't cancel gesture trail update drawing