Merge "[sf] Update snapshots after screenshots" into udc-dev