All required fixes to generate watermarked with play button thumbnails