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

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