Merge "Fix IME flicker: move hiding the surface into the control target" into rvc-dev