Merge "Store line extra in layouts"