Merge "Exposing the layout URI builder method, so that it can be used in tests" into udc-qpr-dev