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

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

Change-Id: I2659b9716d6392bc5c471d4ad42577050380c6cc