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

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

Change-Id: I6e293adf34dda0ea532ff7b8f5352c7fb8a69af8