Merge "Merge "Ensure that task org updates all happen off the main thread"...

Merge "Merge "Ensure that task org updates all happen off the main thread" into rvc-dev am: e8572720 am: 01f5476f" into rvc-d1-dev-plus-aosp am: 566df674 am: 7afcc353

Change-Id: I256a24ae3fe51b2a1d56b09d5c7b389cb82a2ba0