Update notes for submitted changes

* Fix Timer deadlock problem (cherrypick)