Merge "update padding to allow long text to not be truncated" into udc-dev