Merge "Do not reposition leaf tasks from grandparent tasks"