Merge "Remove netd socket" into qt-dev