Merge "Replace tasks in the same split with the dropping app" into sc-v2-dev