Merge "[API Abuse - Text Consistency] Clean up spans and new lines" into main