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