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

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