Merge "Factor a [DiffResultExportStrategy] out of the [ScreenshotTestRule]" into main