Catch temp container thumbnails in cleanup script

Change-Id: Iba2badac3abf08e5c4a409ccf10d831e0e9b341e
Merge "Catch temp container thumbnails in cleanup script"