Should destroy the UserViewClient before discarding it to disconnect its listener from the underlying view client.
Avoid NPE during canApplyTo stage.
Merge branch 'develop' into ui/dev