Merge "Revert "Make the network stack a persistent process."" into qt-dev