Merge "Switch mixed-up ScreenshotRequest parameters" into tm-qpr-dev