Merge "Revert "Annotate state changes on traces"" into sc-v2-dev