Merge "Allow non-leaf task to be moved to top" into rvc-dev