Merge "[sf] fix layer trace generation with new fe" into udc-dev