XD-270 Better idle timeout handling in trigger.