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

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

Change-Id: I8a0d3ed75797454b244df9b6b6650d1a27c06afd