Merge "Update string to be phone/tablet agnostic" into udc-dev