Merge "Revert "Use old IME Switch menu on watch and small screen"" into main