Merge "Retry manifest bcast delivery if the receiver dies as part of unfreezing." into udc-dev