Merge change 21638 into eclair

* changes:
  Don't use BoringLayout to display text that has paragraph-style markup.