Notification count fixes

Supports the new format for push notifications

The UI counter-part of https://github.com/oaeproject/Hilary/pull/1023
Can you make a note that state that `aggregateMessages` assumes that only a single activity will be present in the message?