Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev am: 70a9cd292b
am: 1a37d5fcb9

Change-Id: I15e25c686c21f8bcadd3adc714c7ea5c2b400e12