Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev am: 8a0e91b330

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

Change-Id: I20c2eea060fc170e888d4aa8ec9e834507f85ee5