Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'
This reverts !8836 (merged) as discussed for 9.0 RC1. We will add this back for RC2.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
This reverts !8836 (merged) as discussed for 9.0 RC1. We will add this back for RC2.