Merge "EffectBase: Make callback getter/setter atomic" into sc-dev