Merge "Handle <span>, <ul>, and <li> tags in fromHtml()" into nyc-dev