Merge "TouchedWindow: store tool type in addition to pointer id" into main