Merge "Do not reposition leaf tasks from grandparent tasks" into rvc-qpr-dev