Merge "Support to record multiple activities in the same task as one snapshot." into main