Merge "Fix NPE when converting final screen to empty screen." into sc-qpr1-dev am: 70dd01be85 am: 5980159f00 am: d6578da299

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

Change-Id: Ieb58469aea095eb4fa154297a91be4a081c24165