Merge "Fix Transparent bounds from client layout" into udc-dev