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