Merge "Introduce IME switcher revamp API flag" into main