Merge "Fix 3-button showing up briefly on the AllSet page in setup" into 24D1-dev am: 2155a925fc

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

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