Merge "Hide overview and app icon split option when appropriate" into sc-v2-dev am: fb624f8501

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

Change-Id: I5db96c01c54a0bbf75eb09ae675d58df99a9f40c