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

Change-Id: I11b7166b0179b28a347dfa017f7681ef5e93c1fd