Merge "Fix wallpaper dim logic" into main