Merge "Fix crash in Go Launcher" into sc-v2-dev am: eb2113af00

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

Change-Id: Id9f717a6b4c4893246bc5ef124423a57f80e7aeb