All remaining university students to return to in-person teaching from 17 May