Merge "Ensure that task org updates all happen off the main thread" into rvc-dev