Merge "Revamp IME switcher menu" into main