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

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

Change-Id: Ic842a790d03e7783574cce76b981519e27706e36