Update notes for submitted changes

* CMFM: Fix NPE on exit