Merge "Allow different paragraph breaks in fromHtml()" into nyc-dev