am 20db3ce0: am 95841ac3: Merge "Inconsistent events on transition from gesture detection to touch exploration." into jb-mr1-dev

* commit '20db3ce08b01810b61123340f91a61fa82c0807f':
  Inconsistent events on transition from gesture detection to touch exploration.