Merge "Do not reuse organized task as leaf task" into sc-dev