Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev