Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets