Merge "Add activity-component to transition info change" into main