Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Fix rebase error in !235 (merged).