Merge "Fix Security issue for Html.fromHtml without escape" into sc-v2-dev