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