Merge "NullPointer Exceptions in HostTracker if ARPHandler is shutdown"