Merge "Clear interface addresses upon disconnect"