Merge "When showing a single text line in preview, strip out newlines" into udc-dev