Merge "Adjust color logic to be based only on home wallpaper" into main