Merge "Fix network logging on headless system user"