Merge "Handle 'error_restoring' status in wait_for_volume_status"