Merge "Don't duplicate swipe distance logic in findTargetSceneAndDistance" into main