Merge "Fix text is not readable with black & white wallpaper issue" into main