Merge changes from topic "fix-event-dispatch"

* changes:
  Invert BubbleController <-> NEM dependency
  Inline a few methods in NotificationEntryManager
  Change onRemoteEntry() to only fire when entries are removed