Scarlett Johansson settles Disney lawsuit and announces new movie with the company