Merge "Revert "Work around not working "ime set <imeId>""" into main