Update notes for submitted changes

* CMFM: Sync jellybean with upstream