Merge "Set toolType for 'input tap' events"