Merge "Update local wallpaper colors when areas added and fix stale clock" into sc-v2-dev