Merge "Refactoring some folder binding logic:" into ub-launcher3-master