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

Change-Id: I450514d7443cb9f95e675935d72cd9bbfda0f877