Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Before:
After:
Reverts !1354 (merged) and uses another fix for #2585 (closed).