Merge "Remove Settings constants for NetworkStack"