[#978272] Fixes for default media gallery thumbnail in all cases