Merge "Require both fingers to move before starting two-finger passthrough."