Merge "Fix extra offset of the split layout" into tm-dev