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 '41776eca8ecf87435eef5fcfb47c80ca82e08de8':