[XLS-554] Better management of UserViewClient for resubscription