Merge change 4402 into donut

* changes:
  Fixes #1899284 and #1899287. Give applications more control over the gesture's path.