Merge "Fix swipe end location"