Merge "Fix screenshot failure with transcoding"