Government to shift student housing management back to universities