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

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