am fe6f2bca: am 7165f8f3: Merge "Accounting for background padding when drawing the bg. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit 'fe6f2bca05cdc10bf503736963a3ae1daf13da9e':
  Accounting for background padding when drawing the bg. (Bug 10881814)