Merge "Ensure that we're animating the current live tasks when going back" into tm-dev am: 3e6cd99990 am: e02cd37542 am: 7326a28dac am: f22b4ddfe0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18461390

Change-Id: Ied6a3a3c1762bee27721a84950e855d185534fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>