Merge "Improve code coverage for broadcast radio" into main