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

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

Change-Id: I46967408354d4a46626c46f563aa17743f199ea7