Merge "Fix a couple more issues with canceling the recents animation w/...

Merge "Fix a couple more issues with canceling the recents animation w/ screenshots" into sc-dev am: 00d2556f

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

Change-Id: I3edc9b8c76019a536c74c94d1d576e1566d35267