Merge "Add an option to reorder a task along with its parents" into main