I am fairly sure that the change here is just masking some new height problem (the icon height in the dock are now much taller than in master, thus making the height taller). While it's not the cleanest approach, if there are no visual regressions I think it would be fine to land.