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

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

Change-Id: I799b05e38a504825e54b6bfef143aabf86045541