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

* commit '9e40582f7daa55814a0d74061ac7a404985ad1ab':