Merge "Use InputManagerInternal to report last toolType" into main