Restore gesture navigation

Change-Id: Ibfecbcdcadc57e67561b681b723e784a2c1213ee