Merge commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03' * commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03': Don't use BoringLayout to display text that has paragraph-style markup.
Merge commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03' * commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03': Don't use BoringLayout to display text that has paragraph-style markup.