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

Change-Id: If6d1ec275a8734c1f4c891598aa4c6265cda7ae3