Merge "Decrease number of network logging notifications shown" into oc-dev