Fixed wrong behavior of notification source
Also got rid of unneeded BumblebeeNotificationSource subclass.