Merge "Move Setting constants for NetworkStack"