Merge "Files + text in a separate preview layout." into udc-dev