Merge "Update task organizer state whenever task organizer was set" into rvc-dev am: ffe37623 am: 6121e30d am: ef789153 Change-Id: Ifdfc30784a610eeb53ae40bd291d31931f7a4b34