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

Change-Id: I9e711690b5d28d4a1464d073041cdd09815e434a