Update notes for submitted changes

* Backport 'Make stop_swift() more robust for Grenade'