Merge "Taskbar fixes when apps move to desktop and back" into tm-qpr-dev am: ebfe6b67

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



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