Merge "Remove Settings constants for NetworkStack" into qt-dev