Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2

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

Change-Id: Ic27229e49360d62d6fcd6bda498bfbb601b5e7ee