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

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

Change-Id: I8f3995327033a33d1378e6dcec8a8625f905aa2b