Merge "Add AVIF special case to ThumbnailUtils"