Merge "Reapply "appops: Finish started proxy op when chain fails"" into main