Disney, Johansson end Black Widow dispute