Merge "Keep interface ID stable when rebuilding list"