0.96 swap fixes
This fixes the swap issues that I could find, except for #391 (closed). @mvdan feel free to beat @pserwylo to this, I just assigned it to him because its swap.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This fixes the swap issues that I could find, except for #391 (closed). @mvdan feel free to beat @pserwylo to this, I just assigned it to him because its swap.