am ebdf60e7: am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev

* commit 'ebdf60e7c800b2ccda01887a304ddc0edce0361d':
  Fix line height problem with inline images in StaticLayout.