Merge "Cleanup ClientTransaction#getContextToUpdate" into main