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

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

Change-Id: I736ecf1b61d607a7dda40c5bd75ee283114274a2