Merge "Fix delay when multi-tap out of distance slop."