Merge "Add tap/drag touchpad gesture."