Merge "Wait for broadcast idle instead of sleep"