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

* commit '95841ac3c2d45a839cc3cd0bd420fd9d91ccd583':
  Inconsistent events on transition from gesture detection to touch exploration.