Merge "Moved window manager wallpaper control into separate class"