Merge "Clear 4-way handshake state when network is removed"