Merge "Volume dialog controller: make loading of stream names more robust"