Merge "Make IMM#getCurrentInputMethod{Info,Subtype} consistent" into main