Merge "Raise native-crash socket timeout" into nyc-dev