Merge "Drag thumbnail fixes / improvements"