Merge "Fix test of wait-for-window-on-boot if wallpaper is disabled"