Merge "Migrate to ScreenshotData object" into tm-qpr-dev