Notification count fixes

Supports the new format for push notifications

The UI counter-part of https://github.com/oaeproject/Hilary/pull/1023
I don't think this block is necessary. We are already specifying that the notifications should not be aggregated when we subscribe to a channel.