Merge "Revert "Revert "Delay initial accept() until server initialized"""