Restore gesture navigation

Change-Id: Ib803b58e213470a3578a1302021d49b10daca15c