Merge "Ellipsize long QS labels." into pi-dev