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

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

Change-Id: I9811b2c7defbfbb43eafbf4639c0dafeb6a26d45