Merge "Add a new attribute for TEXT_HEADER_ROW" into udc-qpr-dev