Merge "Adopt HTML/CSS color values in fromHtml()" into nyc-dev