Merge "Fix-up starting style&wallpaper from search" into main