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