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

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

Change-Id: I48f8ef4dd29940960a1da80a0e8728603eec9ff7