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

* commit '6522958d2ebe9f4fb6470407765456320ac0826e':