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

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

Change-Id: I19688906ad851ec0778bd07a48f175bd571a514b