Include graded or ungraded surveys as options in New Quizzes

Given that Classic Quizzes will be sunsetting over the next year, we need a way to create surveys in Canvas (graded or ungraded). Will surveys eventually be included as an option in New Quizzes?