Merge "Fixing crash in folder" into ub-launcher3-master