Merge "metrics for setWifiEnabled & legacy connection APIs" into qt-dev