Merge "Wait for dismiss animation to finish before checking task count" into sc-v2-dev