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

Change-Id: Id5d7458b564b50c1afe0bd67f18fe380819dd80e