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

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

Change-Id: Ic58a7ee319f6c40d72d4e087a49ce030be23db82