Merge "Fix failing tests with desktop wallpaper flag enabled" into main