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

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

Change-Id: I3892a50bfedebf111876056b3720729086434941