#3471 - Push notifications aggregation

Only aggregate activities if there are rules defined for that type
Merge branch 'activity-aggregation' of https://github.com/simong/3akai-ux into activity-aggregation