Merge "Fix container horizontal padding" into ub-launcher3-calgary