Merge "Fix NPE inside dispatchRestoreInstanceState" into sc-dev am: 04d4d0d4f9

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

Change-Id: I4729980d0325b79f7026719f321b2973759c3212