Merge "Fix getLineRight()/getLineLeft()  may compute leadingMargin twice"