[automerger skipped] Merge "Adds the Swipe Up settings page under gestures" into pi-dev am: cb5899f72e
am: a413eb3672
-s ours
Change-Id: Ifd197e1d985602b2019eae7dd92df803490f1f17
This commit is contained in: