am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

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