Merge "Clean up work profile" into ub-launcher3-master