Merge "Remove flaky GestureDetectorTest" into jb-dev