Merge "Do not mark in-process NetworkStack as persistent" into qt-dev