Merge "Update task organizer state whenever task organizer was set" into rvc-dev am: ffe37623 am: 407940a8 am: 22806b8d Change-Id: Ibc1910d4f7a0205be506e23097417a8e3a529b85