Merge "Update task organizer state whenever task organizer was set" into rvc-dev