Merge "Update EffectUUID initialization"