Merge "Handle unexpected interface up/down events"