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

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

Change-Id: I3552e89da4f9f3811aa007efa07a3a5514b351eb