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

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

Change-Id: If9f0306970fbcc7bd688ea7328bc75491a8c61e2