Merge "More improve IME transition during task switch" into sc-v2-dev am: 5b04dc7c7e

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

Change-Id: I006cb5f9720bd1dc2f63a2b8d23dce4499eb4dc6