Merge "Make padding consistent between shortcuts and the app icon." into ub-launcher3-calgary