Merge "Fix edge swipe logic."