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

Change-Id: Id3a0d00d098b43bca8abe4bdad52392e5dc65de8