Merge "Fix test fail for ScreenshotTest."