am 88f2f8fb: am 1d220c31: am 8bcdff50: Merge "Ensuring that we offset cell items by their destination cell padding. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '88f2f8fb43951c747e45080b010dd782216a65ba':