Merge "[sf] fix screenshots when new fe is enabled" into udc-dev