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

Change-Id: Icb477c08842c4103e13fcde189347a6a6c58220f