Merge "Change description string of Wi-Fi add device" into qt-dev