fix cairo_renderer usage in demo/viewer + revert aac69d0b34203f856070cfe5bf909fbf84853b7f