Merge "Delay initial accept() until server initialized"