Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into nyc-mr1-dev