Merge "Fix NPE in ScreenshotHelper" into rvc-dev