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

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

Change-Id: I1083b778cbf1fe743a9f4d336fd9953363d08639