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

Change-Id: Icfdb94eaec6cb3084023ebb40afa8feee5c14cf7