Merge "Fix a case that task jump when dismissing" into sc-v2-dev