Merge "Avoid unnecessary Html.fromHtml()" into main