Seeing as the background is always being drawn, always attempt to place icons within the appropriate area.
This actually brings the behaviour back in line with 4.1 with regard to when two or more rows are shown and gives a more visually pleasing experience.

Icon minimum sizes are also now taken into account, which essentially causes icons to be centered rather than top(left)-aligned when the panel becomes too small to fit a whole icon.