Make gallery NOT treat some images as videos.

Revert "Rework thumbnail handling"

This reverts commit 2ba6ed3b1cb60667cc4babc914482bf23f042e1f.

Change-Id: Ifab0f4b6186a3dc9e5a68af7931724692113b8f1