Merge "Fix a couple polish bugs with new folder previews" into ub-launcher3-calgary