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

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

Change-Id: I3d19bad36c5c3c7a16881731e81cdc24cea9e18e