Merge "Hook up shell transit to metrics and interleave abort with merge" into sc-v2-dev