Merge "Consolidate swipe state in SwipeHelper"