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

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



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