Merge "New permissions UI, again." into jb-mr1-dev