Merge "Move more stuff in WallpaperUtils"