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

Change-Id: I4af6af2f11c9938bdd1d6caacb6854e6292b7d9c