Merge "Update IME switcher icon in taskbar" into main