Merge "Decouple swipe distance from start threshold" into main