Merge "Revert "Add tests for line breaking that considers overhangs""