Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets"