Merge "Remove dead code related to legacy broadcast queue." into main