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

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

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



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