Merge "Adds a null check for an unlikely static wallpaper migration failure" into main