Merge "Fix regression in getting top running task to split with" into main