Merge "Re-enable swipe."