Merge "Apply DeviceEffects on rule activation/deactivation" into main