Merge "Check for null shortcut before adding new split select options" into sc-v2-dev am: 1e846622c7

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

Change-Id: I22d707d699927913bc1c12faf8f58fc8f50a4761