Merge "Introduce folder name type (auto vs manual)." into ub-launcher3-master