* commit 'b12318be13be00842d124e4391ce5eabce2d5104': Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""