am 8cacf102: Merge "Tweaking clings again to support smaller folders (Bug 10965184)" into jb-ub-now-indigo-rose

* commit '8cacf102eb0bd0d84f781b2db4722590398c0ed9':
  Tweaking clings again to support smaller folders (Bug 10965184)