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