Merge "Resolve segfault when running send-broadcast command while statscompanion service is not connected"