Merge "Fix launcher leaks" into ub-launcher3-master