Merge "Support IME switcher icon visibility update"