Refactor|Surface: Ensure Surface's owner link is never invalidated