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