Merge "DepthCompositeStream: Fix erase() in error case"