San Diego Comic-Con agrees to stay through 2024