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 'c9e9ca2dc3e55a8333fc8f0b886b2ca3e25419f9':