Merge "Integrate storage of originalComponentName field for ArchiveActivityInfo" into main