Merge "Fix waitForBroadcastIdle()"