Merge "Abbreviate permission labels less aggressively" into pi-dev