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

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

Change-Id: I59aa61468b63a03c6ea7207f97d4f9a2980fd809