Merge "Fix dangling NetworkAgent"