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

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