Merge "Rename GesureType to GestureId"