Merge "Use badged icons for permissions." into nyc-dev