am b3538082: am 5362f273: Merge "Fix line height problem with inline images in...
am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit 'b3538082':
Fix line height problem with inline images in StaticLayout.