Merge "Fix home settings landing page" into sc-dev am: 1bd6fdb6e3 am: 01e01ebb39

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

Change-Id: I23dc1d2d65a9c868d934f068f3f8bb2f2e37399b