Merge "GestureConverter: add option to make 3-finger tap a shortcut" into main