Merge "Update IME switcher icon" into lmp-dev