Also add support for capturing displays that are not the main display as
preparation for moving the code from test-plugins into a proper plugin
in the future