Merge "Revert "Consider icon scale when calculating icon offset in shelf"" into pi-dev