Gesture fixes

Change-Id: Ib9be38b13ac5b01375276541103ec132d30db3c1