am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in...
am 40b0d4d7: Merge "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"" into klp-modular-dev
* commit '40b0d4d7':
Revert "DO NOT MERGE Fix line breaking for clusters in narrow views"