Merge "Fixing issue with folder inflation" into ub-launcher3-burnaby