Revert "FW: Swipe to switch"

This reverts commit 8cb7fe9c67456aaa0005f68b8bac4d42dfc8880a.

Change-Id: I46a79bf76c8251ea05033bbe87968a2f764a609f