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