Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev