Merge "Don't set client visibility to false while resumed" into udc-qpr-dev