Merge "Fix wallpaper picker color for contrast issues (2/2)" into udc-dev