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

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

Change-Id: Ie6d11b74141ff777b10f05919b9a61f7af809900