Merge "Do not reposition leaf tasks for single task stacks" into sc-dev