Merge "Revert "Remove timeout from waitForBroadcastIdle to improve spikiness."" into main