Merge "Always deliver toolType from toolkit to IME" into main