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