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

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

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