Merge "Fix two small thumbnail leaks" into ub-launcher3-master