Scarlett Johansson settles legal dispute with Disney