Merge "Fix QSB flicker when returning home." into tm-qpr-dev am: 5b01486024

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

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