Merge "Fix bug when doing signal handler lookup."