am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev

* commit 'e2820ed9636368884b09347ce49658757b696b71':
  Optimize setting padding and backgrounds for views