Merge "Ensure that task org updates all happen off the main thread" into...
Merge "Ensure that task org updates all happen off the main thread" into rvc-dev am: e8572720 am: 3dcbe383 am: d8e4c17c am: 31dfe769 am: a33ed915
Change-Id: I4bd1861b7ab37cef4afdb84259379ca81d0554dc