Merge "Add defaults to enable/disable NetworkStackNext"