Merge "Consider icon scale when calculating icon offset in shelf" into pi-dev am: 00c132cd35
am: 47dbc38d5f

Change-Id: Ib89f65c44834d7e34342b6b8ef37f4b147466fc8