Merge "Ensuring that we offset cell items by their destination cell padding. (Bug 10881814)" into jb-ub-now-indigo-rose