Merge "Strip embedded userId from shared URIs" into udc-qpr-dev