Rebase with LiveWallpaper_Master