Merge "Fix Transit clock color in lock screen being overriden in wallpaper preview" into main