Merge "Fix a couple of issues with app close" into ub-launcher3-master