Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into oc-dev