Merge "Conform the logic to decide wallpaper darkness" into udc-dev