Merge "Use onSecondaryContainer color in IME switcher" into main