Merge "WifiConfigManager: Remove user choice on disableEphemeralNetwork" into qt-dev