Merge "add Convert from TouchEvent to TouchData" into devel/master