Merge "Fix flickering when switched to the task without IME shown" into sc-dev am: 7f95e16a am: 85553d02

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

Change-Id: Id6979e92f2c709ded99b5b27ca420c69445338f5