am c7ed6f69: Merge "Minimum work to make volume handling work with sessions" into lmp-preview-dev

* commit 'c7ed6f69d474f23df89d36ed94ff0062daa8dcbc':
  Minimum work to make volume handling work with sessions