Merge "AllSet page fixes" into sc-dev am: 50f43df36e am: 895dd1cb87

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

Change-Id: If7067d835f61acee0e666892cd4f3e0d8802d4a4