Merge "Ensure wallpaper surface is valid (not released) before dimming" into main