Merge "Encode BulletSpan in toHtml() conversion"