Merge "Update strings for mini-resolver views" into udc-dev