Merge "Add test mapping for ScreenshotHelperTests"