Carnival Encounter returns from dry dock