Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev