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 am: 067e124e

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

Change-Id: I97a308153f01ebf18033ff172fe31c475035199f