Merge "Compute bounding box and use it during line break" into main