Merge "Fix for NetworkStats/Telephony deadlock" into qt-dev