Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev