am 5a341135: am fca80dec: am 41776eca: am 2cc2e4ab: am 2ac85a6d: Merge "Ensuring that we restore bounds when resizing them for folder preview drawing. (Bug 11203738)" into jb-ub-now-indigo-rose

* commit '5a3411352320d7fb6c58822cbf4711e6b33ce088':