Merge "Fix interface notification race"