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

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

Change-Id: I4e4f87ae3eef22a9e15e5219b8885e629a65ca97