Merge "Revert "Fix home settings landing page"" into sc-dev am: fe139cdf69

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

Change-Id: I04d964a3e0a37b36d73e2cc97e3a573de47dc6a7