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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15473418

Change-Id: I308f9e4ea7bba81b007aacf3ddcef33f5ee80806