Merge "[sf] Only trace rebuildLayerStacks if there are changes" into main