Merge "Reset override when manually activating a manually deactivated zen rule" into main