Merge "Removing some folder customization options" into ub-launcher3-master