Merge "Save/load ZenDeviceEffects as part of ZenRule" into main