Merge "Fix IME hanging around" into rvc-dev