Merge "Fork volume_dialog.xml for the BC25 update" into main