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

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

Change-Id: I70d67df56f081297722bbe761a7c0eda933aaae4