UK tourists will no longer need to quarantine after holidaying in Portugal, but travellers returning from Croatia will have to self-isolate.