Marvel Drops Jonathan Majors Following Assault Conviction