Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev