Merge "Fix incorrect icon alignment on shelf" into pi-dev am: 33540449fc
am: 5a647deab3

Change-Id: I7741ad0635a4ba46eab29718b9e2bfed5f307f9f