Merge "Revert^2 "Fix VDM IME handling:"" into main