Merge "Updates AllSetActivity extra keys to match SUW." into sc-dev