Merge "[DO NOT MERGE] Revert "Fix flickering when switched to the task without IME shown"" into sc-dev