Revert "RC: Swipe to switch"

This reverts commit 941697e66978524fedecca1c47091d64d60e8e2b.

Change-Id: Id3fa9281609e9c762cb09083fc1118e850184fa4