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