Merge "Fix whenToCheck returned by AttentionDetector"