Merge "Annotate threads for some IME handling methods"