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

Change-Id: Id9fab2c7242fe202209580af74c3ba84eb5d7caa