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

* commit 'd80dc80dbf15f0329a085b21e6e6e4c993e68505':
  Get rid of duplicate backgrounds