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