Merge "Genericize naming of sw720dp wallpapers" into jb-mr1-dev