[OS-BUILD PATCH] Fix underline mark-up after text change