Merge "Clean up a couple of bugs about transport init staging" into nyc-dev