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

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

Change-Id: Ia0d1e25b57da4715850b8b49ca4f34c9aa671f69