Merge "Revert "Use movement on the trackpad instead of on screen for trackpad gestures used for gesture nav""