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