Some gesture fixes

Change-Id: If023531ebb9ece261a9f914220a3bbaabfb47e54