Merge "Implement new volume display policy." into jb-dev