Merge "Remove unused setMacAddress in WificondControl" into qt-dev