Merge "Fix StaticLayout maxLineHeight warning"