Merge "Add a feature flag for SPA metrics" into udc-dev