Merge "Fix 3309250: Don't crash when thumbnail is null"