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: Ibb29a9c091f9c02d0dc45c1cf420b44d5bcd1b5f