Merge "Replace the VDM broadcast for device closed with listener." into main