Merge "Make sure to properly default the screen size during wallpaper restore"