Merge "Remove TextWrapping automation" into udc-qpr-dev