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

Change-Id: I3e04979d029ce139cd70d8e3c56382a31a57b886