am 439cee51: 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 '439cee51df40a3fbdfd4ab6279b96011d58ac9b0':