Small clean up in host renderer and host renderer surface

Small clean up in host renderer and host renderer surface #2013