am dd99f70a: am dfae6db0: Merge "Implement new volume display policy." into jb-dev

* commit 'dd99f70a3f8e661799ecda271d31fc385a80ecb5':
  Implement new volume display policy.