Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev