Merge "Adjust handle sizing per mocks." into udc-dev