Message bus logic changes to Alarm & AlarmsManager, injection fixed -
TODO: publish events.