am d699ad18: Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev

* commit 'd699ad187756b1138e6c697c285dd476c2d0c449':
  Remove the WaitEvent added in Tap and Drag.