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

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

Change-Id: I1f8a45f7a639f6c2a513cb74633a95f2329ef24e