Merge "Revert "Fix flickering when switched to the task without IME shown"" into sc-v2-dev