Merge "Fix user cleanup in modern broadcast queue."