[PATCH 10/11] Always account for device removals in their containers.