Merge "Revert "Remove IME surface when occured in multi-window mode"" into rvc-dev