Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev