Merge "Do not destroy UCE when associated subId changes with the same subid" into sc-dev