Merge "Fix the visiblity of the ime switcher icon."