Merge "Gesture event refactor" into devel/master