Merge "Fix a case that task jump when dismissing" into sc-v2-dev am: 055d9a5f07

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

Change-Id: I31aae2a9bed46f7421f330126a4a1f5cbca48767