Jonathan Majors' ex drops assault and defamation lawsuit after Meagan Good engagement