Restore gesture navigation

Change-Id: Icd2e7f91d4a5b7cf5f36f9a86f0f81f7c58278e1