Merge "Remove unused string and overlay" into udc-dev