Merge "Update EffectUUID initialization" into udc-dev