Merge "Fix the "ime set <imeId>" workaround" into main