Merge "More accurate editorTooltype from handwriting receiver" into main