Merge "[API Abuse - Text Consistency] Keep Messaging Message Style Spans" into main