am aec5943f: am d80dc80d: Merge "Get rid of duplicate backgrounds" into jb-mr2-dev

* commit 'aec5943f7996219482cf4fecfdf9485fd5953f91':
  Get rid of duplicate backgrounds