Merge "Reorder device rescue with volume for overlap"