Merge "Fix default network transition event recording" into nyc-dev