Merge "Set active volume device to null if there is no new device"