Merge "Ensure that task org updates all happen off the main thread" into...
Merge "Ensure that task org updates all happen off the main thread" into rvc-dev am: e8572720 am: 3dcbe383 am: d8e4c17c am: 31dfe769
Change-Id: I450514d7443cb9f95e675935d72cd9bbfda0f877