Merge "Cleanup IME subtype switching controller and tests" into main