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

* commit '90c22b567b6ccd26a71ad3a713aff1c35205af82':