New COVID rules in place for Wales on return from lockdown