Merge "Adds the Swipe Up settings page under gestures" into pi-dev