- Refactor the code from a static global instance to a lifecycle-aware service instantiated in the DeviceCommunicationService - Fix number of devices reported in the notification - Prevents leaks and properly stops when devices get disconnected