Merge "Ensure that task org updates all happen off the main thread" into rvc-dev am: e85727200d

Change-Id: I46634e7bafc0523e63dd343ad99f38010a447603