Merge "Updating folder UI" into ub-launcher3-burnaby