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: I88b316ec9ade6bc69008b9d3a4113dc02f06b4cf