Merge "Adding padding to the folder content" into ub-launcher3-burnaby