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

Change-Id: I4bd1861b7ab37cef4afdb84259379ca81d0554dc