Merge "wallpaper moved to nodpi"