Merge "Workaround for apps to stop before removing the task" into sc-dev am: 6420de7762

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

Change-Id: Ic8567e1bfecf32218ed598395e22018941a7c6e5