Merge "Workaround for apps to stop before removing the task" into sc-v2-dev am: 98644240ca

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

Change-Id: I12d07e3dbf5eeec81e89d4abdbf0c9c5f1e7e84d