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 '1d220c316ad432f819d8311b7518b48834f4ad19':
  Ensuring that we offset cell items by their destination cell padding. (Bug 10881814)