Merge "Adapt all screen previews to recent changes (2/2)" into udc-dev