Merge "Adding a new attribute to speficy folder label directly in layout" into ub-launcher3-rvc-dev