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

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