Merge "Deflake wallpaper color events" into main