Merge "Ensure that task org updates all happen off the main thread" into rvc-dev am: e8572720 am: 3dcbe383 Change-Id: Id3a0d00d098b43bca8abe4bdad52392e5dc65de8