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