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: I68403eb068a5a29617869cc5e20b196c2d795759