Merge "Extract resolveSwipeSource() and resolveSwipe()" into main