Merge "Improve wallpaper debuggability" into main