Merge "Fixing some activity leaks" into ub-launcher3-master