Merge "Gracefully handle unbind errors when detaching" into main