Merge "New permissions UI." into jb-dev