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

Change-Id: I351d9996100a5144baa7e4854bb43af0e5217ba6