Merge "Improve robustness when deleting abs volume device" into main