Update notes for submitted changes

* Add timeout to WaitForOneFromTask