Small cleanup for gesture navigation

Change-Id: Ife0c0b32af6e2d6bdec2b3462a891019d2ca8417