Merge "Reorganize text related owners"