Merge "Fix leak of NetworkAgentWrapper HandlerThread" into main