Merge "remove waitForBroadcastIdle as the original reason for adding it no longer exists"