Merge "BroadcastQueue: fix subtle soft/hard timeout bug."