Merge "Fix flickering when switched to the task without IME shown" into sc-dev am: 7f95e16a0d am: 876cf97cd0

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

Change-Id: I5b1a074d29a7c8652583c1e35733dfef70684b4a