Merge "Shelf horizontal alignment was a few dps off" into pi-dev