Merge "Add analagous finish activity traces in the client side" into main