Added some logic to video thumbnail generation and disabled it in the same move (see inline @XXX comments)