Gill to lead Gujarat after Pandya returns to Mumbai