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

Change-Id: Id48e3543438a3e1277bc0718af6f133923fd5f7b