Merge "Create ActivityClientRecord early in preExecute" into sc-dev