Merge "SF: Track starting layer state with transaction tracing"