Merge "Fix manual connection to Carrier Wifi" into qt-dev