Merge "Work toggle improvements" into ub-launcher3-master