Merge "Reapply previous states when recreating the task bar" into tm-qpr-dev am: a097a960c8

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

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