Merge "Make shutdown text visible when wallpaper is white" into main