Merge "Fix launcher crash and correct split behavior" into sc-v2-dev am: b017001ae0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16527653

Change-Id: I10ddbf8c29fda5e2bcbdf83145acdf5b20728091