[ros-diffs] [cfinck] 39309: Merge 39307 and use the wallpaper (2/2)