Jonathan Majors’ ex-girlfriend has dropped her lawsuit against him