Merge "Fix build - tests for screenshot helper not updated." into rvc-dev