Restore gesture navigation

Change-Id: If0ebc6a8b021cbbca570ab7891f4b53ecc52f7f4